From 408477d5a728a2508a026b3bf416a576f1d5542d Mon Sep 17 00:00:00 2001 From: "sos22@douglas.cl.cam.ac.uk" Date: Thu, 10 Feb 2005 17:15:32 +0000 Subject: [PATCH] bitkeeper revision 1.1167 (420b96b4EStXs5M4SVJpHN9DT5wwkQ) smp_send_stop sometimes reenabled interrupts. Make sure it doesn't. --- xen/arch/x86/cdb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cdb.c b/xen/arch/x86/cdb.c index b0e8462ac6..4ba5b307bf 100644 --- a/xen/arch/x86/cdb.c +++ b/xen/arch/x86/cdb.c @@ -327,10 +327,6 @@ __trap_to_cdb(struct xen_regs *regs) return; } - /* Try to make things a little more stable by disabling - interrupts while we're here. */ - local_irq_save(flags); - /* We rely on our caller to ensure we're only on one processor * at a time... We should probably panic here, but given that * we're a debugger we should probably be a little tolerant of @@ -346,11 +342,15 @@ __trap_to_cdb(struct xen_regs *regs) if (!atomic_dec_and_test(&xendbg_running)) { printk("WARNING WARNING WARNING: Avoiding recursive xendbg.\n"); atomic_inc(&xendbg_running); - local_irq_restore(flags); return; } smp_send_stop(); + + /* Try to make things a little more stable by disabling + interrupts while we're here. */ + local_irq_save(flags); + old_watchdog = watchdog_on; watchdog_on = 0; -- 2.30.2